diff --git a/.appveyor.yml b/.appveyor.yml
index 275548f51..68e512390 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -28,7 +28,7 @@ environment:
 # only those files for cache invalidation, quicker than checksumming all cached content.
 cache:
 - "%LOCALAPPDATA%\\Programs\\stack"
-- C:\sr                   -> **\*.yaml
+- C:\sr
 - .stack-work
 - hledger-lib\.stack-work -> hledger-lib\**
 - hledger\.stack-work     -> hledger\**
@@ -37,9 +37,14 @@ cache:
 install:
 - curl -skL -ostack.zip http://www.stackage.org/stack/windows-x86_64
 - 7z x stack.zip stack.exe
+- stack --version
 # install ghc
-# 8.2 for hledger-web -> network, https://github.com/haskell/network/issues/313
+# using 8.2 to avoid a hledger-web -> network/stack build issue on windows
+# https://github.com/haskell/network/issues/313
+# https://github.com/commercialhaskell/stack/issues/3944
+# network 2.7.0.1 should work around it when released
 - stack --stack-yaml=stack-ghc8.2.yaml setup
+#- set PATH=C:\Users\appveyor\AppData\Roaming\local\bin;%PATH%
 #- stack install shelltestrunner
 
 # -j1 was a temporary workaround for https://github.com/simonmichael/hledger/issues/424, https://github.com/commercialhaskell/stack/issues/2617, should be unnecessary with ghc 8.2.1+
diff --git a/Makefile b/Makefile
index 52db58095..fe6cd95a9 100644
--- a/Makefile
+++ b/Makefile
@@ -621,15 +621,33 @@ test: pkgtest functest \
 # For very verbose tests add --verbosity=debug. It seems hard to get something in between.
 STACKTEST=$(STACK) test
 
-buildtest: $(call def-help,buildtest, build all hledger packages quickly from scratch ensuring no warnings with default snapshot) \
+buildtest: $(call def-help,buildtest, force-rebuild all hledger packages/modules quickly ensuring no warnings with default snapshot) \
 	buildtest-stack.yaml
 
-buildtest-all: $(call def-help,buildtest-all, build all hledger packages quickly from scratch ensuring no warnings with each ghc version/stackage snapshot )
-	for F in stack-*.yaml; do make --no-print-directory buildtest-$$F; done
+buildtest-all: $(call def-help,buildtest-all, force-rebuild all hledger packages/modules quickly ensuring no warnings with each ghc version/stackage snapshot )
+	for F in stack-*.yaml stack.yaml; do make --no-print-directory buildtest-$$F; done
 
-buildtest-%: $(call def-help,buildtest-STACKFILE, build all hledger packages quickly from scratch ensuring no warnings with the stack yaml file; eg make buildtest-stack-ghc8.2.yaml )
+buildtest-%: $(call def-help,buildtest-STACKFILE, force-rebuild all hledger packages/modules quickly ensuring no warnings with the given stack yaml file; eg make buildtest-stack-ghc8.2.yaml )
 	$(STACK) build --test --bench --fast --force-dirty --ghc-options=-fforce-recomp --ghc-options=-Werror --stack-yaml=$*
 
+incr-buildtest: $(call def-help,incr-buildtest, build any outdated hledger packages/modules quickly ensuring no warnings with default snapshot. Wont detect warnings in up-to-date modules.) \
+	incr-buildtest-stack.yaml
+
+incr-buildtest-all: $(call def-help,incr-buildtest-all, build any outdated hledger packages/modules quickly ensuring no warnings with each ghc version/stackage snapshot. Wont detect warnings in up-to-date modules. )
+	for F in stack-*.yaml stack.yaml; do make --no-print-directory incr-buildtest-$$F; done
+
+incr-buildtest-%: $(call def-help,incr-buildtest-STACKFILE, build any outdated hledger packages/modules quickly ensuring no warnings with the stack yaml file; eg make buildtest-stack-ghc8.2.yaml. Wont detect warnings in up-to-date modules. )
+	$(STACK) build --test --bench --fast --ghc-options=-Werror --stack-yaml=$*
+
+buildplantest: $(call def-help,buildplantest, stack build --dry-run all hledger packages ensuring an install plan with default snapshot) \
+	buildplantest-stack.yaml
+
+buildplantest-all: $(call def-help,buildplantest-all, stack build --dry-run all hledger packages ensuring an install plan with each ghc version/stackage snapshot )
+	for F in stack-*.yaml stack.yaml; do make --no-print-directory buildplantest-$$F; done
+
+buildplantest-%: $(call def-help,buildplantest-STACKFILE, stack build --dry-run all hledger packages ensuring an install plan with the given stack yaml file; eg make buildplantest-stack-ghc8.2.yaml )
+	$(STACK) build --dry-run --test --bench --stack-yaml=$*
+
 pkgtest: $(call def-help,pkgtest, run the test suites in each package )
 	@($(STACKTEST) && echo $@ PASSED) || (echo $@ FAILED; false)
 
@@ -689,12 +707,12 @@ test-stack%yaml:
 	$(STACK) --stack-yaml stack$*yaml build --ghc-options="$(WARNINGS) -Werror" --test --bench --haddock --no-haddock-deps
 
 travistest: $(call def-help,travistest, run tests similar to our travis CI tests)
-	stack clean
-	stack build --ghc-options=-Werror --test --haddock --no-haddock-deps hledger-lib
-	stack build --ghc-options=-Werror --test --haddock --no-haddock-deps hledger
-	stack build --ghc-options=-Werror --test --haddock --no-haddock-deps hledger-ui
-	stack build --ghc-options=-Werror --test --haddock --no-haddock-deps hledger-web
-	stack build --ghc-options=-Werror --test --haddock --no-haddock-deps hledger-api
+	$(STACK) clean
+	$(STACK) build --ghc-options=-Werror --test --haddock --no-haddock-deps hledger-lib
+	$(STACK) build --ghc-options=-Werror --test --haddock --no-haddock-deps hledger
+	$(STACK) build --ghc-options=-Werror --test --haddock --no-haddock-deps hledger-ui
+	$(STACK) build --ghc-options=-Werror --test --haddock --no-haddock-deps hledger-web
+	$(STACK) build --ghc-options=-Werror --test --haddock --no-haddock-deps hledger-api
 	make functest
 
 # committest: hlinttest unittest doctest functest haddocktest buildtest quickcabaltest \
diff --git a/hledger-lib/Hledger/Data/Dates.hs b/hledger-lib/Hledger/Data/Dates.hs
index fcbe69b34..0925d12c1 100644
--- a/hledger-lib/Hledger/Data/Dates.hs
+++ b/hledger-lib/Hledger/Data/Dates.hs
@@ -4,6 +4,7 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE PackageImports #-}
 {-|
 
 Date parsing and utilities for hledger.
@@ -73,9 +74,9 @@ module Hledger.Data.Dates (
 where
 
 import Prelude ()
-import Prelude.Compat
+import "base-compat-batteries" Prelude.Compat
 import Control.Monad
-import Data.List.Compat
+import "base-compat-batteries" Data.List.Compat
 import Data.Default
 import Data.Maybe
 import Data.Text (Text)
diff --git a/hledger-lib/Hledger/Data/StringFormat.hs b/hledger-lib/Hledger/Data/StringFormat.hs
index 4e2c33b37..daf9d57af 100644
--- a/hledger-lib/Hledger/Data/StringFormat.hs
+++ b/hledger-lib/Hledger/Data/StringFormat.hs
@@ -2,7 +2,7 @@
 -- hledger's report item fields. The formats are used by
 -- report-specific renderers like renderBalanceReportItem.
 
-{-# LANGUAGE FlexibleContexts, TypeFamilies #-}
+{-# LANGUAGE FlexibleContexts, TypeFamilies, PackageImports #-}
 
 module Hledger.Data.StringFormat (
           parseStringFormat
@@ -14,7 +14,7 @@ module Hledger.Data.StringFormat (
         ) where
 
 import Prelude ()
-import Prelude.Compat
+import "base-compat-batteries" Prelude.Compat
 import Numeric
 import Data.Char (isPrint)
 import Data.Maybe
diff --git a/hledger-lib/Hledger/Read/Common.hs b/hledger-lib/Hledger/Read/Common.hs
index 4da4a2494..427a1ec54 100644
--- a/hledger-lib/Hledger/Read/Common.hs
+++ b/hledger-lib/Hledger/Read/Common.hs
@@ -15,6 +15,7 @@ Some of these might belong in Hledger.Read.JournalReader or Hledger.Read.
 --- * module
 {-# LANGUAGE CPP, BangPatterns, DeriveDataTypeable, RecordWildCards, NamedFieldPuns, NoMonoLocalBinds, ScopedTypeVariables, FlexibleContexts, TupleSections, OverloadedStrings #-}
 {-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE PackageImports #-}
 
 module Hledger.Read.Common (
   Reader (..),
@@ -94,22 +95,18 @@ module Hledger.Read.Common (
 where
 --- * imports
 import Prelude ()
-import Prelude.Compat hiding (readFile)
-import Control.Monad.Compat
+import "base-compat-batteries" Prelude.Compat hiding (readFile)
+import "base-compat-batteries" Control.Monad.Compat
 import Control.Monad.Except (ExceptT(..), runExceptT, throwError) --, catchError)
 import Control.Monad.State.Strict
-import Data.Bifunctor
 import Data.Char
 import Data.Data
 import Data.Decimal (DecimalRaw (Decimal), Decimal)
 import Data.Default
 import Data.Functor.Identity
-import Data.List.Compat
+import "base-compat-batteries" Data.List.Compat
 import Data.List.NonEmpty (NonEmpty(..))
 import Data.Maybe
-#if !(MIN_VERSION_base(4,11,0))
-import Data.Monoid
-#endif
 import qualified Data.Map as M
 import qualified Data.Semigroup as Sem
 import Data.Text (Text)
@@ -191,19 +188,15 @@ runTextParser, rtp :: TextParser Identity a -> Text -> Either (ParseError Char V
 runTextParser p t =  runParser p "" t
 rtp = runTextParser
 
--- XXX odd, why doesn't this take a JournalParser ?
 -- | Run a journal parser with a null journal-parsing state.
-runJournalParser, rjp :: Monad m => TextParser m a -> Text -> m (Either (ParseError Char Void) a)
-runJournalParser p t = runParserT p "" t
+runJournalParser, rjp :: Monad m => JournalParser m a -> Text -> m (Either (ParseError Char Void) a)
+runJournalParser p t = runParserT (evalStateT p mempty) "" t
 rjp = runJournalParser
 
 -- | Run an error-raising journal parser with a null journal-parsing state.
 runErroringJournalParser, rejp :: Monad m => ErroringJournalParser m a -> Text -> m (Either String a)
-runErroringJournalParser p t =
-  runExceptT $
-  runJournalParser (evalStateT p mempty)
-                   t >>=
-  either (throwError . parseErrorPretty) return
+runErroringJournalParser p t = runExceptT $
+  runJournalParser p t >>= either (throwError . parseErrorPretty) return
 rejp = runErroringJournalParser
 
 genericSourcePos :: SourcePos -> GenericSourcePos
@@ -391,14 +384,14 @@ datep' mYear = do
 
     case fromGregorianValid year month day of
       Nothing -> fail $ "well-formed but invalid date: " ++ dateStr
-      Just date -> pure date
+      Just date -> pure $! date
 
   partialDate :: Maybe Year -> Integer -> Char -> Int -> TextParser m Day
   partialDate mYear month sep day = case mYear of
     Just year ->
       case fromGregorianValid year (fromIntegral month) day of
         Nothing -> fail $ "well-formed but invalid date: " ++ dateStr
-        Just date -> pure date
+        Just date -> pure $! date
       where dateStr = show year ++ [sep] ++ show month ++ [sep] ++ show day
 
     Nothing -> fail $
@@ -451,7 +444,7 @@ modifiedaccountnamep = do
   parent <- getParentAccount
   aliases <- getAccountAliases
   a <- lift accountnamep
-  return $
+  return $!
     accountNameApplyAliases aliases $
      -- XXX accountNameApplyAliasesMemo ? doesn't seem to make a difference
     joinAccountNames parent
@@ -466,14 +459,7 @@ accountnamep :: TextParser m AccountName
 accountnamep = do
   firstPart <- part
   otherParts <- many $ try $ singleSpace *> part
-  let account = T.unwords $ firstPart : otherParts
-
-  let roundTripAccount =
-        accountNameFromComponents $ accountNameComponents account
-  when (account /= roundTripAccount) $ fail $
-    "account name seems ill-formed: " ++ T.unpack account
-
-  pure account
+  pure $! T.unwords $ firstPart : otherParts
   where
     part = takeWhile1P Nothing (not . isSpace)
     singleSpace = void spacenonewline *> notFollowedBy spacenonewline
@@ -507,7 +493,14 @@ test_spaceandamountormissingp = do
 -- right, optional unit or total price, and optional (ignored)
 -- ledger-style balance assertion or fixed lot price declaration.
 amountp :: Monad m => JournalParser m Amount
-amountp = try leftsymbolamountp <|> try rightsymbolamountp <|> nosymbolamountp
+amountp = do
+  amount <- amountwithoutpricep
+  price <- priceamountp
+  pure $ amount { aprice = price }
+
+amountwithoutpricep :: Monad m => JournalParser m Amount
+amountwithoutpricep =
+  try leftsymbolamountp <|> try rightsymbolamountp <|> nosymbolamountp
 
 #ifdef TESTS
 test_amountp = do
@@ -534,11 +527,8 @@ amountp' s =
 mamountp' :: String -> MixedAmount
 mamountp' = Mixed . (:[]) . amountp'
 
-signp :: TextParser m String
-signp = do
-  sign <- optional $ oneOf ("+-" :: [Char])
-  return $ case sign of Just '-' -> "-"
-                        _        -> ""
+signp :: Num a => TextParser m (a -> a)
+signp = char '-' *> pure negate <|> char '+' *> pure id <|> pure id
 
 multiplierp :: TextParser m Bool
 multiplierp = option False $ char '*' *> pure True
@@ -564,25 +554,26 @@ leftsymbolamountp = do
   commodityspaced <- lift $ skipMany' spacenonewline
   (q,prec,mdec,mgrps) <- lift $ numberp suggestedStyle
   let s = amountstyle{ascommodityside=L, ascommodityspaced=commodityspaced, asprecision=prec, asdecimalpoint=mdec, asdigitgroups=mgrps}
-  p <- priceamountp
-  let applysign = if sign=="-" then negate else id
-  return $ applysign $ Amount c q p s m
+  return $ Amount c (sign q) NoPrice s m
   <?> "left-symbol amount"
 
 rightsymbolamountp :: Monad m => JournalParser m Amount
 rightsymbolamountp = do
   m <- lift multiplierp
   sign <- lift signp
-  rawnum <- lift $ rawnumberp
-  expMod <- lift . option id $ try exponentp
+  ambiguousRawNum <- lift rawnumberp
+  mExponent <- lift $ optional $ try exponentp
   commodityspaced <- lift $ skipMany' spacenonewline
   c <- lift commoditysymbolp
   suggestedStyle <- getAmountStyle c
-  let (q0,prec0,mdec,mgrps) = fromRawNumber suggestedStyle (sign == "-") rawnum
-      (q, prec) = expMod (q0, prec0)
-  p <- priceamountp
+
+  let rawNum = either (disambiguateNumber suggestedStyle) id ambiguousRawNum
+  (q, prec, mdec, mgrps) <- case fromRawNumber rawNum mExponent of
+    Left errMsg -> fail errMsg
+    Right res -> pure res
+
   let s = amountstyle{ascommodityside=R, ascommodityspaced=commodityspaced, asprecision=prec, asdecimalpoint=mdec, asdigitgroups=mgrps}
-  return $ Amount c q p s m
+  return $ Amount c (sign q) NoPrice s m
   <?> "right-symbol amount"
 
 nosymbolamountp :: Monad m => JournalParser m Amount
@@ -590,17 +581,17 @@ nosymbolamountp = do
   m <- lift multiplierp
   suggestedStyle <- getDefaultAmountStyle
   (q,prec,mdec,mgrps) <- lift $ numberp suggestedStyle
-  p <- priceamountp
   -- apply the most recently seen default commodity and style to this commodityless amount
   defcs <- getDefaultCommodityAndStyle
   let (c,s) = case defcs of
         Just (defc,defs) -> (defc, defs{asprecision=max (asprecision defs) prec})
         Nothing          -> ("", amountstyle{asprecision=prec, asdecimalpoint=mdec, asdigitgroups=mgrps})
-  return $ Amount c q p s m
+  return $ Amount c q NoPrice s m
   <?> "no-symbol amount"
 
 commoditysymbolp :: TextParser m CommoditySymbol
-commoditysymbolp = (quotedcommoditysymbolp <|> simplecommoditysymbolp) <?> "commodity symbol"
+commoditysymbolp =
+  quotedcommoditysymbolp <|> simplecommoditysymbolp <?> "commodity symbol"
 
 quotedcommoditysymbolp :: TextParser m CommoditySymbol
 quotedcommoditysymbolp =
@@ -614,14 +605,10 @@ priceamountp :: Monad m => JournalParser m Price
 priceamountp = option NoPrice $ try $ do
   lift (skipMany spacenonewline)
   char '@'
-
-  m <- optional $ char '@'
-  let priceConstructor = case m of
-        Just _  -> TotalPrice
-        Nothing -> UnitPrice
+  priceConstructor <- char '@' *> pure TotalPrice <|> pure UnitPrice
 
   lift (skipMany spacenonewline)
-  priceAmount <- amountp -- XXX can parse more prices ad infinitum, shouldn't
+  priceAmount <- amountwithoutpricep
 
   pure $ priceConstructor priceAmount
 
@@ -675,27 +662,19 @@ numberp suggestedStyle = do
     -- interspersed with periods, commas, or both
     -- ptrace "numberp"
     sign <- signp
-    raw <- rawnumberp
+    rawNum <- either (disambiguateNumber suggestedStyle) id <$> rawnumberp
+    mExp <- optional $ try $ exponentp
     dbg8 "numberp suggestedStyle" suggestedStyle `seq` return ()
-    let num@(q, prec, decSep, groups) = dbg8 "numberp quantity,precision,mdecimalpoint,mgrps" (fromRawNumber suggestedStyle (sign == "-") raw)
-    option num . try $ do
-        when (isJust groups) $ fail "groups and exponent are not mixable"
-        (q', prec') <- exponentp <*> pure (q, prec)
-        return (q', prec', decSep, groups)
+    case dbg8 "numberp quantity,precision,mdecimalpoint,mgrps"
+           $ fromRawNumber rawNum mExp of
+      Left errMsg -> fail errMsg
+      Right (q, p, d, g) -> pure (sign q, p, d, g)
     <?> "numberp"
 
-exponentp :: TextParser m ((Quantity, Int) -> (Quantity, Int))
-exponentp = do
-    char' 'e'
-    exp <- liftM read $ (++) <$> signp <*> some digitChar
-    return $ bimap (* 10^^exp) (max 0 . subtract exp)
-    <?> "exponentp"
+exponentp :: TextParser m Int
+exponentp = char' 'e' *> signp <*> decimal <?> "exponentp"
 
--- | Interpret a raw number as a decimal number, and identify the decimal
--- point charcter and digit separating scheme. There is only one ambiguous
--- case: when there is just a single separator between two digit groups.
--- Disambiguate using an amount style, if provided; otherwise, assume that
--- the separator is a decimal point.
+-- | Interpret a raw number as a decimal number.
 --
 -- Returns:
 -- - the decimal number
@@ -703,80 +682,61 @@ exponentp = do
 -- - the decimal point character, if any
 -- - the digit group style, if any (digit group character and sizes of digit groups)
 fromRawNumber
-  :: Maybe AmountStyle
-  -> Bool
-  -> RawNumber
-  -> (Quantity, Int, Maybe Char, Maybe DigitGroupStyle)
-fromRawNumber suggestedStyle negated raw = case raw of
+  :: RawNumber
+  -> Maybe Int
+  -> Either String
+            (Quantity, Int, Maybe Char, Maybe DigitGroupStyle)
+fromRawNumber raw mExp = case raw of
 
-  LeadingDecimalPt decPt digitGrp ->
-    let quantity = sign $
-          Decimal (fromIntegral precision) (digitGroupNumber digitGrp)
-        precision = digitGroupLength digitGrp
-    in  (quantity, precision, Just decPt, Nothing)
+  NoSeparators digitGrp mDecimals ->
+    let mDecPt = fmap fst mDecimals
+        decimalGrp = maybe mempty snd mDecimals
 
-  TrailingDecimalPt digitGrp decPt ->
-    let quantity = sign $
-          Decimal (fromIntegral precision) (digitGroupNumber digitGrp)
-        precision = 0
-    in  (quantity, precision, Just decPt, Nothing)
+        (quantity, precision) =
+          maybe id applyExp mExp $ toQuantity digitGrp decimalGrp
 
-  NoSeparators digitGrp ->
-    let quantity = sign $
-          Decimal (fromIntegral precision) (digitGroupNumber digitGrp)
-        precision = 0
-    in  (quantity, precision, Nothing, Nothing)
+    in  Right (quantity, precision, mDecPt, Nothing)
 
-  AmbiguousNumber digitGrp1 sep digitGrp2
-    -- If present, use the suggested style to disambiguate;
-    -- otherwise, assume that the separator is a decimal point where possible.
-    |    isDecimalPointChar sep
-      && maybe True (sep `isValidDecimalBy`) suggestedStyle ->
+  WithSeparators digitSep digitGrps mDecimals -> case mExp of
+    Nothing -> 
+      let mDecPt = fmap fst mDecimals
+          decimalGrp = maybe mempty snd mDecimals
+          digitGroupStyle = DigitGroups digitSep (groupSizes digitGrps)
 
-      -- Assuming that the separator is a decimal point
-      let quantity = sign $
-            Decimal (fromIntegral precision)
-                    (digitGroupNumber $ digitGrp1 <> digitGrp2)
-          precision = digitGroupLength digitGrp2
-      in  (quantity, precision, Just sep, Nothing)
+          (quantity, precision) = toQuantity (mconcat digitGrps) decimalGrp
 
-    | otherwise ->
-      -- Assuming that the separator is digit separator
-      let quantity = sign $
-            Decimal (fromIntegral precision)
-                    (digitGroupNumber $ digitGrp1 <> digitGrp2)
-          precision = 0
-          digitGroupStyle = Just $
-            DigitGroups sep (groupSizes $ [digitGrp1, digitGrp2])
-      in  (quantity, precision, Nothing, digitGroupStyle)
-
-  DigitSeparators digitSep digitGrps ->
-    let quantity = sign $
-          Decimal (fromIntegral precision)
-                  (digitGroupNumber $ mconcat digitGrps)
-        precision = 0
-        digitGroupStyle = Just $ DigitGroups digitSep (groupSizes digitGrps)
-    in  (quantity, precision, Nothing, digitGroupStyle)
-
-  BothSeparators digitSep digitGrps decPt decimalGrp ->
-    let quantity = sign $
-          Decimal (fromIntegral precision)
-                  (digitGroupNumber $ mconcat digitGrps <> decimalGrp)
-        precision = digitGroupLength decimalGrp
-        digitGroupStyle = Just $ DigitGroups digitSep (groupSizes digitGrps)
-    in  (quantity, precision, Just decPt, digitGroupStyle)
+      in  Right (quantity, precision, mDecPt, Just digitGroupStyle)
+    Just _ ->
+      Left "mixing digit separators with exponents is not allowed"
 
   where
-
-    sign :: Decimal -> Decimal
-    sign = if negated then negate else id
-
     -- Outputs digit group sizes from least significant to most significant
     groupSizes :: [DigitGrp] -> [Int]
     groupSizes digitGrps = reverse $ case map digitGroupLength digitGrps of
       (a:b:cs) | a < b -> b:cs
       gs               -> gs
 
+    toQuantity :: DigitGrp -> DigitGrp -> (Quantity, Int)
+    toQuantity preDecimalGrp postDecimalGrp = (quantity, precision)
+      where
+        quantity = Decimal (fromIntegral precision)
+                           (digitGroupNumber $ preDecimalGrp <> postDecimalGrp)
+        precision = digitGroupLength postDecimalGrp
+
+    applyExp :: Int -> (Decimal, Int) -> (Decimal, Int)
+    applyExp exponent (quantity, precision) =
+      (quantity * 10^^exponent, max 0 (precision - exponent))
+
+
+disambiguateNumber :: Maybe AmountStyle -> AmbiguousNumber -> RawNumber
+disambiguateNumber suggestedStyle (AmbiguousNumber grp1 sep grp2) =
+  -- If present, use the suggested style to disambiguate;
+  -- otherwise, assume that the separator is a decimal point where possible.
+  if isDecimalPointChar sep &&
+     maybe True (sep `isValidDecimalBy`) suggestedStyle
+  then NoSeparators grp1 (Just (sep, grp2))
+  else WithSeparators sep [grp1, grp2] Nothing
+  where
     isValidDecimalBy :: Char -> AmountStyle -> Bool
     isValidDecimalBy c = \case
       AmountStyle{asdecimalpoint = Just d} -> d == c
@@ -784,13 +744,12 @@ fromRawNumber suggestedStyle negated raw = case raw of
       AmountStyle{asprecision = 0} -> False
       _ -> True
 
-
--- | Parse and interpret the structure of a number as far as possible
--- without external hints. Numbers are digit strings, possibly separated
--- into digit groups by one of two types of separators. (1) Numbers may
--- optionally have a decimal point, which may be either a period or comma.
--- (2) Numbers may optionally contain digit group separators, which must
--- all be either a period, a comma, or a space.
+-- | Parse and interpret the structure of a number without external hints.
+-- Numbers are digit strings, possibly separated into digit groups by one
+-- of two types of separators. (1) Numbers may optionally have a decimal
+-- point, which may be either a period or comma. (2) Numbers may
+-- optionally contain digit group separators, which must all be either a
+-- period, a comma, or a space.
 --
 -- It is our task to deduce the identities of the decimal point and digit
 -- separator characters, based on the allowed syntax. For instance, we
@@ -798,54 +757,63 @@ fromRawNumber suggestedStyle negated raw = case raw of
 -- must succeed all digit group separators.
 --
 -- >>> parseTest rawnumberp "1,234,567.89"
--- BothSeparators ',' ["1","234","567"] '.' "89"
+-- Right (WithSeparators ',' ["1","234","567"] (Just ('.',"89")))
+-- >>> parseTest rawnumberp "1,000"
+-- Left (AmbiguousNumber "1" ',' "000")
 -- >>> parseTest rawnumberp "1 000"
--- AmbiguousNumber "1" ' ' "000"
+-- Right (WithSeparators ' ' ["1","000"] Nothing)
 --
-rawnumberp :: TextParser m RawNumber
+rawnumberp :: TextParser m (Either AmbiguousNumber RawNumber)
 rawnumberp = label "rawnumberp" $ do
-  rawNumber <- leadingDecimalPt <|> leadingDigits
-
+  rawNumber <- fmap Right leadingDecimalPt <|> leadingDigits
   -- Guard against mistyped numbers
-  notFollowedBy $ satisfy isDecimalPointChar <|> (char ' ' >> digitChar)
-
+  notFollowedBy $ satisfy isDecimalPointChar <|> char ' ' *> digitChar
   return $ dbg8 "rawnumberp" rawNumber
-
   where
 
   leadingDecimalPt :: TextParser m RawNumber
-  leadingDecimalPt =
-    LeadingDecimalPt <$> satisfy isDecimalPointChar <*> pdigitgroup
+  leadingDecimalPt = do
+    decPt <- satisfy isDecimalPointChar
+    decGrp <- digitgroupp
+    pure $ NoSeparators mempty (Just (decPt, decGrp))
 
-  leadingDigits :: TextParser m RawNumber
+  leadingDigits :: TextParser m (Either AmbiguousNumber RawNumber)
   leadingDigits = do
-    grp1 <- pdigitgroup
-    withSeparators grp1 <|> trailingDecimalPt grp1 <|> pure (NoSeparators grp1)
+    grp1 <- digitgroupp
+    withSeparators grp1 <|> fmap Right (trailingDecimalPt grp1)
+                        <|> pure (Right $ NoSeparators grp1 Nothing)
 
-  withSeparators :: DigitGrp -> TextParser m RawNumber
+  withSeparators :: DigitGrp -> TextParser m (Either AmbiguousNumber RawNumber)
   withSeparators grp1 = do
-    (sep, grp2) <- try $ (,) <$> satisfy isDigitSeparatorChar <*> pdigitgroup
-    grps <- many $ try $ char sep *> pdigitgroup
+    (sep, grp2) <- try $ (,) <$> satisfy isDigitSeparatorChar <*> digitgroupp
+    grps <- many $ try $ char sep *> digitgroupp
 
     let digitGroups = grp1 : grp2 : grps
-    withDecimalPt sep digitGroups <|> pure (withoutDecimalPt grp1 sep grp2 grps)
+    fmap Right (withDecimalPt sep digitGroups)
+      <|> pure (withoutDecimalPt grp1 sep grp2 grps)
 
   withDecimalPt :: Char -> [DigitGrp] -> TextParser m RawNumber
   withDecimalPt digitSep digitGroups = do
-    decimalPt <- satisfy $ \c -> isDecimalPointChar c && c /= digitSep
-    decimalDigitGroup <- option mempty pdigitgroup
+    decPt <- satisfy $ \c -> isDecimalPointChar c && c /= digitSep
+    decDigitGrp <- option mempty digitgroupp
 
-    pure $ BothSeparators digitSep digitGroups decimalPt decimalDigitGroup
+    pure $ WithSeparators digitSep digitGroups (Just (decPt, decDigitGrp))
 
-  withoutDecimalPt :: DigitGrp -> Char -> DigitGrp -> [DigitGrp] -> RawNumber
+  withoutDecimalPt
+    :: DigitGrp
+    -> Char
+    -> DigitGrp
+    -> [DigitGrp]
+    -> Either AmbiguousNumber RawNumber
   withoutDecimalPt grp1 sep grp2 grps
-    | null grps = AmbiguousNumber grp1 sep grp2
-    | otherwise = DigitSeparators sep (grp1:grp2:grps)
+    | null grps && isDecimalPointChar sep =
+        Left $ AmbiguousNumber grp1 sep grp2
+    | otherwise = Right $ WithSeparators sep (grp1:grp2:grps) Nothing
 
   trailingDecimalPt :: DigitGrp -> TextParser m RawNumber
   trailingDecimalPt grp1 = do
-    decimalPt <- satisfy isDecimalPointChar
-    pure $ TrailingDecimalPt grp1 decimalPt
+    decPt <- satisfy isDecimalPointChar
+    pure $ NoSeparators grp1 (Just (decPt, mempty))
 
 
 isDecimalPointChar :: Char -> Bool
@@ -856,8 +824,8 @@ isDigitSeparatorChar c = isDecimalPointChar c || c == ' '
 
 
 data DigitGrp = DigitGrp {
-  digitGroupLength :: Int,
-  digitGroupNumber :: Integer
+  digitGroupLength :: !Int,
+  digitGroupNumber :: !Integer
 } deriving (Eq)
 
 instance Show DigitGrp where
@@ -874,8 +842,8 @@ instance Monoid DigitGrp where
   mempty = DigitGrp 0 0
   mappend = (Sem.<>)
 
-pdigitgroup :: TextParser m DigitGrp
-pdigitgroup = label "digit group"
+digitgroupp :: TextParser m DigitGrp
+digitgroupp = label "digit group"
             $ makeGroup <$> takeWhile1P (Just "digit") isDigit
   where
     makeGroup = uncurry DigitGrp . foldl' step (0, 0) . T.unpack
@@ -883,12 +851,11 @@ pdigitgroup = label "digit group"
 
 
 data RawNumber
-  = LeadingDecimalPt  Char DigitGrp                 -- .50
-  | TrailingDecimalPt DigitGrp Char                 -- 100.
-  | NoSeparators      DigitGrp                      -- 100
-  | AmbiguousNumber   DigitGrp Char DigitGrp        -- 1,000
-  | DigitSeparators   Char [DigitGrp]               -- 1,000,000
-  | BothSeparators    Char [DigitGrp] Char DigitGrp -- 1,000.50
+  = NoSeparators   DigitGrp (Maybe (Char, DigitGrp))        -- 100 or 100. or .100 or 100.50
+  | WithSeparators Char [DigitGrp] (Maybe (Char, DigitGrp)) -- 1,000,000 or 1,000.50
+  deriving (Show, Eq)
+
+data AmbiguousNumber = AmbiguousNumber DigitGrp Char DigitGrp  -- 1,000
   deriving (Show, Eq)
 
 -- test_numberp = do
@@ -1137,19 +1104,19 @@ bracketedpostingdatesp mdefdate = do
 -- default date is provided. A missing year in DATE2 will be inferred
 -- from DATE.
 --
--- >>> first parseErrorPretty $ rtp (bracketeddatetagsp Nothing) "[2016/1/2=3/4]"
+-- >>> either (Left . parseErrorPretty) Right $ rtp (bracketeddatetagsp Nothing) "[2016/1/2=3/4]"
 -- Right [("date",2016-01-02),("date2",2016-03-04)]
 --
--- >>> first parseErrorPretty $ rtp (bracketeddatetagsp Nothing) "[1]"
+-- >>> either (Left . parseErrorPretty) Right $ rtp (bracketeddatetagsp Nothing) "[1]"
 -- Left ...not a bracketed date...
 --
--- >>> first parseErrorPretty $ rtp (bracketeddatetagsp Nothing) "[2016/1/32]"
+-- >>> either (Left . parseErrorPretty) Right $ rtp (bracketeddatetagsp Nothing) "[2016/1/32]"
 -- Left ...1:11:...well-formed but invalid date: 2016/1/32...
 --
--- >>> first parseErrorPretty $ rtp (bracketeddatetagsp Nothing) "[1/31]"
+-- >>> either (Left . parseErrorPretty) Right $ rtp (bracketeddatetagsp Nothing) "[1/31]"
 -- Left ...1:6:...partial date 1/31 found, but the current year is unknown...
 --
--- >>> first parseErrorPretty $ rtp (bracketeddatetagsp Nothing) "[0123456789/-.=/-.=]"
+-- >>> either (Left . parseErrorPretty) Right $ rtp (bracketeddatetagsp Nothing) "[0123456789/-.=/-.=]"
 -- Left ...1:13:...expecting month or day...
 --
 bracketeddatetagsp :: Maybe Day -> SimpleTextParser [(TagName, Day)]
diff --git a/hledger-lib/Hledger/Read/CsvReader.hs b/hledger-lib/Hledger/Read/CsvReader.hs
index 15ec8df0c..8d301f585 100644
--- a/hledger-lib/Hledger/Read/CsvReader.hs
+++ b/hledger-lib/Hledger/Read/CsvReader.hs
@@ -11,6 +11,7 @@ A reader for CSV data, using an extra rules file to help interpret the data.
 {-# LANGUAGE ViewPatterns #-}
 {-# LANGUAGE TypeSynonymInstances #-}
 {-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE PackageImports #-}
 
 module Hledger.Read.CsvReader (
   -- * Reader
@@ -28,14 +29,14 @@ module Hledger.Read.CsvReader (
 )
 where
 import Prelude ()
-import Prelude.Compat hiding (getContents)
+import "base-compat-batteries" Prelude.Compat hiding (getContents)
 import Control.Exception hiding (try)
 import Control.Monad
 import Control.Monad.Except
 import Control.Monad.State.Strict (StateT, get, modify', evalStateT)
 -- import Test.HUnit
 import Data.Char (toLower, isDigit, isSpace)
-import Data.List.Compat
+import "base-compat-batteries" Data.List.Compat
 import Data.List.NonEmpty (fromList)
 import Data.Maybe
 import Data.Ord
diff --git a/hledger-lib/Hledger/Read/JournalReader.hs b/hledger-lib/Hledger/Read/JournalReader.hs
index 431a6b373..a357761b7 100644
--- a/hledger-lib/Hledger/Read/JournalReader.hs
+++ b/hledger-lib/Hledger/Read/JournalReader.hs
@@ -29,7 +29,7 @@ import cycles.
 
 --- * module
 
-{-# LANGUAGE CPP, RecordWildCards, NamedFieldPuns, NoMonoLocalBinds, ScopedTypeVariables, FlexibleContexts, TupleSections, OverloadedStrings #-}
+{-# LANGUAGE CPP, RecordWildCards, NamedFieldPuns, NoMonoLocalBinds, ScopedTypeVariables, FlexibleContexts, TupleSections, OverloadedStrings, PackageImports #-}
 
 module Hledger.Read.JournalReader (
 --- * exports
@@ -72,15 +72,12 @@ module Hledger.Read.JournalReader (
 where
 --- * imports
 import Prelude ()
-import Prelude.Compat hiding (readFile)
+import "base-compat-batteries" Prelude.Compat hiding (readFile)
 import qualified Control.Exception as C
 import Control.Monad
 import Control.Monad.Except (ExceptT(..), runExceptT, throwError)
 import Control.Monad.State.Strict
 import qualified Data.Map.Strict as M
-#if !(MIN_VERSION_base(4,11,0))
-import Data.Monoid
-#endif
 import Data.Text (Text)
 import Data.String
 import Data.List
diff --git a/hledger-lib/Hledger/Read/TimeclockReader.hs b/hledger-lib/Hledger/Read/TimeclockReader.hs
index 4dd2ee355..05b259c0b 100644
--- a/hledger-lib/Hledger/Read/TimeclockReader.hs
+++ b/hledger-lib/Hledger/Read/TimeclockReader.hs
@@ -40,7 +40,7 @@ i, o or O.  The meanings of the codes are:
 
 -}
 
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings, PackageImports #-}
 
 module Hledger.Read.TimeclockReader (
   -- * Reader
@@ -52,7 +52,7 @@ module Hledger.Read.TimeclockReader (
 )
 where
 import           Prelude ()
-import           Prelude.Compat
+import "base-compat-batteries" Prelude.Compat
 import           Control.Monad
 import           Control.Monad.Except (ExceptT)
 import           Control.Monad.State.Strict
diff --git a/hledger-lib/Hledger/Read/TimedotReader.hs b/hledger-lib/Hledger/Read/TimedotReader.hs
index da70994f9..656384ffc 100644
--- a/hledger-lib/Hledger/Read/TimedotReader.hs
+++ b/hledger-lib/Hledger/Read/TimedotReader.hs
@@ -23,7 +23,7 @@ inc.client1   .... .... ..
 
 -}
 
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings, PackageImports #-}
 
 module Hledger.Read.TimedotReader (
   -- * Reader
@@ -35,7 +35,7 @@ module Hledger.Read.TimedotReader (
 )
 where
 import Prelude ()
-import Prelude.Compat
+import "base-compat-batteries" Prelude.Compat
 import Control.Monad
 import Control.Monad.Except (ExceptT)
 import Control.Monad.State.Strict
diff --git a/hledger-lib/Hledger/Reports/ReportOptions.hs b/hledger-lib/Hledger/Reports/ReportOptions.hs
index 39c05d2b2..d97803bf8 100644
--- a/hledger-lib/Hledger/Reports/ReportOptions.hs
+++ b/hledger-lib/Hledger/Reports/ReportOptions.hs
@@ -38,9 +38,6 @@ where
 
 import Control.Applicative ((<|>))
 import Data.Data (Data)
-#if !MIN_VERSION_base(4,8,0)
-import Data.Functor.Compat ((<$>))
-#endif
 import Data.List
 import Data.Maybe
 import qualified Data.Text as T
diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal
index 7dac4d34f..6ccd34c9c 100644
--- a/hledger-lib/hledger-lib.cabal
+++ b/hledger-lib/hledger-lib.cabal
@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 22b7806755a6e3d8afa63a7e941273b64188b90a6695b78fa7f59dcb150e19f7
+-- hash: 4e9f93f0ca43f594b381f1e1e03e67ce3379bd4830b260e6f7dc1596b946993f
 
 name:           hledger-lib
 version:        1.9.99
@@ -105,7 +105,7 @@ library
     , ansi-terminal >=0.6.2.3
     , array
     , base >=4.8 && <4.12
-    , base-compat >=0.8.1
+    , base-compat-batteries >=0.10.1 && <0.11
     , blaze-markup >=0.5.1
     , bytestring
     , cmdargs >=0.10
@@ -116,7 +116,7 @@ library
     , directory
     , extra
     , filepath
-    , hashtables >=1.2
+    , hashtables >=1.2.3.1
     , megaparsec >=6.4.1
     , mtl
     , mtl-compat
@@ -200,7 +200,7 @@ test-suite doctests
     , ansi-terminal >=0.6.2.3
     , array
     , base >=4.8 && <4.12
-    , base-compat >=0.8.1
+    , base-compat-batteries >=0.10.1 && <0.11
     , blaze-markup >=0.5.1
     , bytestring
     , cmdargs >=0.10
@@ -212,7 +212,7 @@ test-suite doctests
     , doctest >=0.8
     , extra
     , filepath
-    , hashtables >=1.2
+    , hashtables >=1.2.3.1
     , megaparsec >=6.4.1
     , mtl
     , mtl-compat
@@ -232,8 +232,6 @@ test-suite doctests
   if (!impl(ghc >= 8.0))
     build-depends:
         semigroups ==0.18.*
-  if impl(ghc >= 8.4) && os(darwin)
-    buildable: False
   default-language: Haskell2010
 
 test-suite easytests
@@ -297,7 +295,7 @@ test-suite easytests
     , ansi-terminal >=0.6.2.3
     , array
     , base >=4.8 && <4.12
-    , base-compat >=0.8.1
+    , base-compat-batteries >=0.10.1 && <0.11
     , blaze-markup >=0.5.1
     , bytestring
     , cmdargs >=0.10
@@ -309,7 +307,7 @@ test-suite easytests
     , easytest
     , extra
     , filepath
-    , hashtables >=1.2
+    , hashtables >=1.2.3.1
     , hledger-lib
     , megaparsec >=6.4.1
     , mtl
@@ -393,7 +391,7 @@ test-suite hunittests
     , ansi-terminal >=0.6.2.3
     , array
     , base >=4.8 && <4.12
-    , base-compat >=0.8.1
+    , base-compat-batteries >=0.10.1 && <0.11
     , blaze-markup >=0.5.1
     , bytestring
     , cmdargs >=0.10
@@ -404,7 +402,7 @@ test-suite hunittests
     , directory
     , extra
     , filepath
-    , hashtables >=1.2
+    , hashtables >=1.2.3.1
     , hledger-lib
     , megaparsec >=6.4.1
     , mtl
diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml
index 2413462d0..b4425fcc8 100644
--- a/hledger-lib/package.yaml
+++ b/hledger-lib/package.yaml
@@ -40,7 +40,7 @@ extra-source-files:
 
 dependencies:
 - base >=4.8 && <4.12
-- base-compat >=0.8.1
+- base-compat-batteries >=0.10.1 && <0.11
 - ansi-terminal >=0.6.2.3
 - array
 - blaze-markup >=0.5.1
@@ -53,7 +53,7 @@ dependencies:
 - deepseq
 - directory
 - filepath
-- hashtables >=1.2
+- hashtables >=1.2.3.1
 - megaparsec >=6.4.1
 - mtl
 - mtl-compat
@@ -154,10 +154,12 @@ tests:
     dependencies:
     - doctest >=0.8
     - Glob >=0.7
-    # doctest won't run with ghc 8.4 on mac right now, https://github.com/sol/hpack/issues/199
-    when:
-    - condition: impl(ghc >= 8.4) && os(darwin)
-      buildable: false
+    # doctest with ghc 8.4 on mac requires a workaround, but we'll leave it enabled
+    # https://ghc.haskell.org/trac/ghc/ticket/15105#comment:10
+    # https://github.com/sol/doctest/issues/199
+    # when:
+    # - condition: impl(ghc >= 8.4) && os(darwin)
+    #   buildable: false
 
   hunittests:
     main: hunittests.hs
diff --git a/hledger-ui/Hledger/UI/Editor.hs b/hledger-ui/Hledger/UI/Editor.hs
index 79daac3b2..efdce3a0a 100644
--- a/hledger-ui/Hledger/UI/Editor.hs
+++ b/hledger-ui/Hledger/UI/Editor.hs
@@ -83,7 +83,7 @@ identifyEditor :: String -> EditorType
 identifyEditor cmd
   | "emacsclient" `isPrefixOf` exe = EmacsClient
   | "emacs" `isPrefixOf` exe       = Emacs
-  | exe `elem` ["vi","vim","ex","view","gvim","gview","evim","eview","rvim","rview","rgvim","rgview"]
+  | exe `elem` ["vi","nvim","vim","ex","view","gvim","gview","evim","eview","rvim","rview","rgvim","rgview"]
                                    = Vi
   | otherwise                      = Other
   where
diff --git a/hledger-ui/Hledger/UI/Main.hs b/hledger-ui/Hledger/UI/Main.hs
index b4b6fa5f3..b7c138b7d 100644
--- a/hledger-ui/Hledger/UI/Main.hs
+++ b/hledger-ui/Hledger/UI/Main.hs
@@ -212,7 +212,7 @@ runBrickUi uopts@UIOpts{cliopts_=copts@CliOpts{reportopts_=ropts}} j = do
           d
           -- predicate: ignore changes not involving our files
           (\fev -> case fev of
-            Modified f _ -> f `elem` files
+            Modified f _ False -> f `elem` files
             -- Added    f _ -> f `elem` files
             -- Removed  f _ -> f `elem` files
             -- we don't handle adding/removing journal files right now
@@ -223,7 +223,7 @@ runBrickUi uopts@UIOpts{cliopts_=copts@CliOpts{reportopts_=ropts}} j = do
           -- action: send event to app
           (\fev -> do
             -- return $ dbglog "fsnotify" $ showFSNEvent fev -- not working
-            dbg1IO "fsnotify" $ showFSNEvent fev
+            dbg1IO "fsnotify" $ show fev
             writeChan eventChan FileChange
             )
 
@@ -234,7 +234,3 @@ runBrickUi uopts@UIOpts{cliopts_=copts@CliOpts{reportopts_=ropts}} j = do
         let myVty = mkVty def
 #endif
         void $ customMain myVty (Just eventChan) brickapp ui
-
-showFSNEvent (Added    f _) = "Added "    ++ show f
-showFSNEvent (Modified f _) = "Modified " ++ show f
-showFSNEvent (Removed  f _) = "Removed "  ++ show f
diff --git a/hledger-ui/Hledger/UI/UIOptions.hs b/hledger-ui/Hledger/UI/UIOptions.hs
index c3dc7e6fc..daa0e1ec4 100644
--- a/hledger-ui/Hledger/UI/UIOptions.hs
+++ b/hledger-ui/Hledger/UI/UIOptions.hs
@@ -6,9 +6,6 @@
 module Hledger.UI.UIOptions
 where
 import Data.Default
-#if !MIN_VERSION_base(4,8,0)
-import Data.Functor.Compat ((<$>))
-#endif
 import Data.List (intercalate)
 import System.Environment
 
diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal
index b071a0cf5..7720f0aa7 100644
--- a/hledger-ui/hledger-ui.cabal
+++ b/hledger-ui/hledger-ui.cabal
@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 0c78f681a99e0d6cc3ae1ff87b9397afc508292a6c412d00c85b5cdb5607b933
+-- hash: 82e8763ca935ff359245f2b359e094fe863143d27e58a2d90b0ddb1e3d7c272e
 
 name:           hledger-ui
 version:        1.9.99
@@ -69,13 +69,13 @@ executable hledger-ui
     , ansi-terminal >=0.6.2.3
     , async
     , base >=4.8 && <4.12
-    , base-compat >=0.8.1
+    , base-compat-batteries >=0.10.1 && <0.11
     , cmdargs >=0.8
     , containers
     , data-default
     , directory
     , filepath
-    , fsnotify >=0.2
+    , fsnotify >=0.3.0.1
     , hledger >=1.9.99 && <2.0
     , hledger-lib >=1.9.99 && <2.0
     , megaparsec >=6.4.1
diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml
index cee94c886..8bac02ce3 100644
--- a/hledger-ui/package.yaml
+++ b/hledger-ui/package.yaml
@@ -40,31 +40,31 @@ flags:
 cpp-options: -DVERSION="1.9.99"
 
 dependencies:
- - hledger >=1.9.99 && <2.0
- - hledger-lib >=1.9.99 && <2.0
- - ansi-terminal >=0.6.2.3
- - async
- - base >=4.8 && <4.12
- - base-compat >=0.8.1
- - cmdargs >=0.8
- - containers
- - data-default
- - directory
- - filepath
- - fsnotify >=0.2
- - HUnit
- - microlens >=0.4
- - microlens-platform >=0.2.3.1
- - megaparsec >=6.4.1
- - pretty-show >=1.6.4
- - process >=1.2
- - safe >=0.2
- - split >=0.1
- - text >=1.2
- - text-zipper >=0.4
- - time >=1.5
- - transformers
- - vector
+- hledger >=1.9.99 && <2.0
+- hledger-lib >=1.9.99 && <2.0
+- ansi-terminal >=0.6.2.3
+- async
+- base >=4.8 && <4.12
+- base-compat-batteries >=0.10.1 && <0.11
+- cmdargs >=0.8
+- containers
+- data-default
+- directory
+- filepath
+- fsnotify >=0.3.0.1
+- HUnit
+- microlens >=0.4
+- microlens-platform >=0.2.3.1
+- megaparsec >=6.4.1
+- pretty-show >=1.6.4
+- process >=1.2
+- safe >=0.2
+- split >=0.1
+- text >=1.2
+- text-zipper >=0.4
+- time >=1.5
+- transformers
+- vector
 
 when:
  # curses is required to build terminfo for vty for hledger-ui.
diff --git a/hledger-web/Foundation.hs b/hledger-web/Foundation.hs
index f59a3220d..32cb56f69 100644
--- a/hledger-web/Foundation.hs
+++ b/hledger-web/Foundation.hs
@@ -8,9 +8,6 @@ See a default Yesod app's comments for more details of each part.
 module Foundation where
 
 import Prelude
-#if !MIN_VERSION_base(4,8,0)
-import Control.Applicative ((<$>))
-#endif
 import Data.IORef
 import Yesod
 import Yesod.Static
diff --git a/hledger-web/Handler/AddForm.hs b/hledger-web/Handler/AddForm.hs
index d6096a966..00ed77c1d 100644
--- a/hledger-web/Handler/AddForm.hs
+++ b/hledger-web/Handler/AddForm.hs
@@ -7,9 +7,6 @@ module Handler.AddForm where
 
 import Import
 
-#if !MIN_VERSION_base(4,8,0)
-import Control.Applicative
-#endif
 import Control.Monad.State.Strict (evalStateT)
 import Data.Either (lefts,rights)
 import Data.List (sort)
diff --git a/hledger-web/Hledger/Web/Main.hs b/hledger-web/Hledger/Web/Main.hs
index fe9d36d0d..5f7ec9fd8 100644
--- a/hledger-web/Hledger/Web/Main.hs
+++ b/hledger-web/Hledger/Web/Main.hs
@@ -19,9 +19,6 @@ import Data.String
 import Network.Wai.Handler.Warp (runSettings, defaultSettings, setHost, setPort)
 import Network.Wai.Handler.Launch (runHostPortUrl)
 --
-#if !MIN_VERSION_base(4,8,0)
-import Control.Applicative ((<$>))
-#endif
 import Control.Monad
 import Data.Default
 import Data.Text (pack)
diff --git a/hledger-web/Hledger/Web/WebOptions.hs b/hledger-web/Hledger/Web/WebOptions.hs
index a6964a934..c5a4b6f74 100644
--- a/hledger-web/Hledger/Web/WebOptions.hs
+++ b/hledger-web/Hledger/Web/WebOptions.hs
@@ -3,9 +3,6 @@ module Hledger.Web.WebOptions
 where
 import Prelude
 import Data.Default
-#if !MIN_VERSION_base(4,8,0)
-import Data.Functor.Compat ((<$>))
-#endif
 import Data.Maybe
 import System.Environment
 
diff --git a/hledger-web/Import.hs b/hledger-web/Import.hs
index c3f373663..8c943c467 100644
--- a/hledger-web/Import.hs
+++ b/hledger-web/Import.hs
@@ -7,9 +7,6 @@ import           Prelude              as Import hiding (head, init, last,
                                                  readFile, tail, writeFile)
 import           Yesod                as Import hiding (Route (..))
 
-#if !MIN_VERSION_base(4,8,0)
-import           Control.Applicative  as Import (pure, (<$>), (<*>))
-#endif
 import           Data.Text            as Import (Text)
 
 import           Foundation           as Import
diff --git a/hledger-web/Settings.hs b/hledger-web/Settings.hs
index 759851895..923c7e683 100644
--- a/hledger-web/Settings.hs
+++ b/hledger-web/Settings.hs
@@ -13,9 +13,6 @@ import Yesod.Default.Config
 import Yesod.Default.Util
 import Data.Text (Text)
 import Data.Yaml
-#if !MIN_VERSION_base(4,8,0)
-import Control.Applicative
-#endif
 import Settings.Development
 import Data.Default (def)
 import Text.Hamlet
diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal
index 73e1045a8..256543344 100644
--- a/hledger-web/hledger-web.cabal
+++ b/hledger-web/hledger-web.cabal
@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: c000d351c61aeef057878385c2fbb01b696d20af9137ac2210902ba8de60bfaa
+-- hash: f9b958b9292d00ff739999dbd9f5a467b38eac93caa7d16950e03c4c15737b4c
 
 name:           hledger-web
 version:        1.9.99
@@ -144,7 +144,7 @@ library
   build-depends:
       HUnit
     , base >=4.8 && <4.12
-    , base-compat >=0.8.1
+    , base-compat-batteries >=0.10.1 && <0.11
     , blaze-html
     , blaze-markup
     , bytestring
@@ -195,7 +195,7 @@ executable hledger-web
   build-depends:
       HUnit
     , base >=4.8 && <4.12
-    , base-compat >=0.8.1
+    , base-compat-batteries >=0.10.1 && <0.11
     , blaze-html
     , blaze-markup
     , bytestring
@@ -254,7 +254,7 @@ test-suite test
   build-depends:
       HUnit
     , base >=4.8 && <4.12
-    , base-compat >=0.8.1
+    , base-compat-batteries >=0.10.1 && <0.11
     , blaze-html
     , blaze-markup
     , bytestring
diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml
index 7486e4633..5043a431e 100644
--- a/hledger-web/package.yaml
+++ b/hledger-web/package.yaml
@@ -65,7 +65,7 @@ dependencies:
 - hledger-lib >=1.9.99 && <2.0
 - hledger >=1.9.99 && <2.0
 - base >=4.8 && <4.12
-- base-compat >=0.8.1
+- base-compat-batteries >=0.10.1 && <0.11
 - blaze-html
 - blaze-markup
 - bytestring
diff --git a/hledger/Hledger/Cli/CliOptions.hs b/hledger/Hledger/Cli/CliOptions.hs
index 98ca4aa33..6ccec16cd 100644
--- a/hledger/Hledger/Cli/CliOptions.hs
+++ b/hledger/Hledger/Cli/CliOptions.hs
@@ -5,7 +5,7 @@ related utilities used by hledger commands.
 
 -}
 
-{-# LANGUAGE CPP, ScopedTypeVariables, DeriveDataTypeable, FlexibleContexts, TypeFamilies, OverloadedStrings #-}
+{-# LANGUAGE CPP, ScopedTypeVariables, DeriveDataTypeable, FlexibleContexts, TypeFamilies, OverloadedStrings, PackageImports #-}
 
 module Hledger.Cli.CliOptions (
 
@@ -71,16 +71,13 @@ module Hledger.Cli.CliOptions (
 where
 
 import Prelude ()
-import Prelude.Compat
+import "base-compat-batteries" Prelude.Compat
 import qualified Control.Exception as C
 import Control.Monad (when)
 import Data.Char
 import Data.Default
-#if !MIN_VERSION_base(4,8,0)
-import Data.Functor.Compat ((<$>))
-#endif
 import Data.Functor.Identity (Identity)
-import Data.List.Compat
+import "base-compat-batteries" Data.List.Compat
 import Data.List.Split (splitOneOf)
 import Data.Ord
 import Data.Maybe
diff --git a/hledger/Hledger/Cli/Commands/Add.hs b/hledger/Hledger/Cli/Commands/Add.hs
index 3af5ca493..228ed0705 100644
--- a/hledger/Hledger/Cli/Commands/Add.hs
+++ b/hledger/Hledger/Cli/Commands/Add.hs
@@ -3,7 +3,7 @@ A history-aware add command to help with data entry.
 |-}
 
 {-# OPTIONS_GHC -fno-warn-missing-signatures -fno-warn-unused-do-bind #-}
-{-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable, RecordWildCards, TypeOperators, FlexibleContexts, OverloadedStrings #-}
+{-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable, RecordWildCards, TypeOperators, FlexibleContexts, OverloadedStrings, PackageImports #-}
 
 module Hledger.Cli.Commands.Add (
    addmode
@@ -15,7 +15,7 @@ module Hledger.Cli.Commands.Add (
 where
 
 import Prelude ()
-import Prelude.Compat
+import "base-compat-batteries" Prelude.Compat
 import Control.Exception as E
 import Control.Monad
 import Control.Monad.Trans.Class
@@ -23,7 +23,7 @@ import Control.Monad.State.Strict (evalState, evalStateT)
 import Control.Monad.Trans (liftIO)
 import Data.Char (toUpper, toLower)
 import Data.Functor.Identity (Identity(..))
-import Data.List.Compat
+import "base-compat-batteries" Data.List.Compat
 import qualified Data.Set as S
 import Data.Maybe
 import Data.Text (Text)
diff --git a/hledger/Hledger/Cli/Commands/Help.hs b/hledger/Hledger/Cli/Commands/Help.hs
index 14d6f774b..b6341c665 100644
--- a/hledger/Hledger/Cli/Commands/Help.hs
+++ b/hledger/Hledger/Cli/Commands/Help.hs
@@ -7,6 +7,7 @@ The help command.
 --TODO substring matching
 
 {-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE PackageImports #-}
 
 module Hledger.Cli.Commands.Help (
 
@@ -16,7 +17,7 @@ module Hledger.Cli.Commands.Help (
   ) where
 
 import Prelude ()
-import Prelude.Compat
+import "base-compat-batteries" Prelude.Compat
 import Data.Char
 import Data.List
 import Data.Maybe
diff --git a/hledger/Hledger/Cli/DocFiles.hs b/hledger/Hledger/Cli/DocFiles.hs
index 1b60e481f..066ef8821 100644
--- a/hledger/Hledger/Cli/DocFiles.hs
+++ b/hledger/Hledger/Cli/DocFiles.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TemplateHaskell, OverloadedStrings #-}
+{-# LANGUAGE TemplateHaskell, OverloadedStrings, PackageImports #-}
 {-|
 
 Embedded documentation files in various formats, and helpers for viewing them.
@@ -21,7 +21,7 @@ module Hledger.Cli.DocFiles (
   ) where
 
 import Prelude ()
-import Prelude.Compat
+import "base-compat-batteries" Prelude.Compat
 import Data.FileEmbed
 import Data.String
 import System.IO
diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal
index 838db2d65..59fdfe042 100644
--- a/hledger/hledger.cabal
+++ b/hledger/hledger.cabal
@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 0f0ae8e75569c28e8c5987ba06696f6dbbbfc9334de43851eb1d1420ffc89d5a
+-- hash: 9c5b2134da8c5338d453b421424d33bf6ad43c1c12eca02dcd6711b23d7ae77a
 
 name:           hledger
 version:        1.9.99
@@ -116,7 +116,7 @@ library
     , HUnit
     , ansi-terminal >=0.6.2.3
     , base >=4.8 && <4.12
-    , base-compat >=0.8.1
+    , base-compat-batteries >=0.10.1 && <0.11
     , bytestring
     , cmdargs >=0.10
     , containers
@@ -168,7 +168,7 @@ executable hledger
     , HUnit
     , ansi-terminal >=0.6.2.3
     , base >=4.8 && <4.12
-    , base-compat >=0.8.1
+    , base-compat-batteries >=0.10.1 && <0.11
     , bytestring
     , cmdargs >=0.10
     , containers
@@ -222,7 +222,7 @@ test-suite test
     , HUnit
     , ansi-terminal >=0.6.2.3
     , base >=4.8 && <4.12
-    , base-compat >=0.8.1
+    , base-compat-batteries >=0.10.1 && <0.11
     , bytestring
     , cmdargs >=0.10
     , containers
@@ -275,7 +275,7 @@ benchmark bench
     , HUnit
     , ansi-terminal >=0.6.2.3
     , base >=4.8 && <4.12
-    , base-compat >=0.8.1
+    , base-compat-batteries >=0.10.1 && <0.11
     , bytestring
     , cmdargs >=0.10
     , containers
diff --git a/hledger/package.yaml b/hledger/package.yaml
index c2cb56235..50cbc3df4 100644
--- a/hledger/package.yaml
+++ b/hledger/package.yaml
@@ -81,7 +81,7 @@ dependencies:
 - hledger-lib >=1.9.99 && <2.0
 - ansi-terminal >=0.6.2.3
 - base >=4.8 && <4.12
-- base-compat >=0.8.1
+- base-compat-batteries >=0.10.1 && <0.11
 - bytestring
 - cmdargs >=0.10
 - containers
diff --git a/site/download.md b/site/download.md
index aec56d4fe..15347e429 100644
--- a/site/download.md
+++ b/site/download.md
@@ -33,7 +33,7 @@ but they can be [out of date](https://repology.org/metapackage/hledger/badges) o
 
 |
 |----------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-| Windows:             | [1.9.1](https://ci.appveyor.com/api/buildjobs/ln9saus4y41gr1n8/artifacts/hledger.zip) or [latest nightly dev build](https://ci.appveyor.com/api/projects/simonmichael/hledger/artifacts/hledger.zip?branch=master) (<span class=warnings>[no hledger-ui](https://github.com/jtdaugherty/vty/pull/1#issuecomment-297143444), [don't work on old windows ?](https://github.com/simonmichael/hledger/issues/774))</span>
+| Windows:             | [1.9.1](https://ci.appveyor.com/api/buildjobs/ln9saus4y41gr1n8/artifacts/hledger.zip) or [latest nightly dev build](https://ci.appveyor.com/api/projects/simonmichael/hledger/artifacts/hledger.zip?branch=master) (<span class=warnings>[no hledger-ui](https://github.com/jtdaugherty/vty/pull/1#issuecomment-297143444), [doesn't work on old windows ?](https://github.com/simonmichael/hledger/issues/774), [unusually many files in PATH causing hangs](https://github.com/simonmichael/hledger/issues/791))</span>
 | Mac:                 | **`brew install hledger`** <span class=warnings>([only hledger CLI](https://github.com/simonmichael/hledger/issues/321#issuecomment-179920520))</span>
 | Arch Linux:          | **`pacman -S hledger`**
 | Debian,&nbsp;Ubuntu: | **`sudo apt install hledger hledger-ui hledger-web`**
diff --git a/stack-ghc7.10.yaml b/stack-ghc7.10.yaml
index e1aaca9e4..e78f964b8 100644
--- a/stack-ghc7.10.yaml
+++ b/stack-ghc7.10.yaml
@@ -8,24 +8,85 @@ packages:
 - hledger
 - hledger-ui
 - hledger-web
-- hledger-api
+#- hledger-api
 
 extra-deps:
-- attoparsec-iso8601-1.0.0.0
-- brick-0.24.2
-- cpphs-1.20.8
-- data-clist-0.1.2.0
 - easytest-0.2
-- http-api-data-0.3.7.1
+# avoid no hashable instance for AccountName from doctests
+- hashtables-1.2.3.1
+# Many newer versions to allow using the latest base-compat with all ghc versions.
+# This is just the first workable install plan I found.
+- adjunctions-4.4
+- aeson-1.3.1.1
+- aeson-compat-0.3.7.1
+- attoparsec-0.13.2.2
+- attoparsec-iso8601-1.0.0.0
+- base-compat-0.10.1
+- base-compat-batteries-0.10.1
+- base-orphans-0.7
+- bifunctors-5.5.2
+- brick-0.37.1
+- config-ini-0.2.2.0
+- criterion-1.4.1.0
+- data-clist-0.1.2.1
+- exceptions-0.10.0
+- free-5.0.2
+- generics-sop-0.3.2.0
+- Glob-0.9.2
+- hashable-1.2.7.0
+- http-media-0.7.1.2
+- http-types-0.12.1
+- insert-ordered-containers-0.2.1.0
+- integer-logarithms-1.0.2.1
+- kan-extensions-5.1
+- lens-4.16.1
 - megaparsec-6.4.1
-- natural-transformation-0.4
+- microstache-1.0.1.1
+- mmorph-1.1.2
+- monad-control-1.0.2.3
+- network-2.6.3.5
+- optparse-applicative-0.14.2.0
 - parser-combinators-0.4.0
 - persistent-2.7.0
-- persistent-template-2.5.2
-- servant-0.11
-- servant-server-0.11
-- text-zipper-0.10
-- th-orphans-0.13.4
-- vty-5.17.1
+- persistent-template-2.5.4
+- profunctors-5.2.2
+- resourcet-1.1.11
+- scientific-0.3.6.2
+- semigroupoids-5.2.2
+- semigroups-0.18.4
+- singleton-bool-0.1.4
+- statistics-0.14.0.2
+- tagged-0.8.5
+- text-1.2.3.0
+- text-zipper-0.10.1
+- th-abstraction-0.2.6.0
+- transformers-compat-0.6.1.4
+- unliftio-core-0.1.1.0
+- unordered-containers-0.2.9.0
+- vty-5.21
 - word-wrap-0.4.1
 - yesod-persistent-1.4.2
+
+# - servant-0.13.0.1
+# - servant-server-0.13.0.1
+# - servant-swagger-1.1.5
+# - swagger2-2.2.2
+# # - attoparsec-iso8601-1.0.0.0
+# # - base-compat-0.9.3
+# - brick-0.24.2
+# - cpphs-1.20.8
+# - data-clist-0.1.2.0
+# - http-api-data-0.3.7.1
+# - natural-transformation-0.4
+# # - persistent-template-2.5.2
+# # - servant-0.11
+# # - servant-server-0.11
+# - text-zipper-0.10
+# - th-orphans-0.13.4
+# - vty-5.17.1
+# - word-wrap-0.4.1
+
+# hledger-ui
+# newer fsnotify has a different api and may be more robust
+- fsnotify-0.3.0.1
+- shelly-1.7.2
diff --git a/stack-ghc8.0.yaml b/stack-ghc8.0.yaml
index cfff0b8ec..871967e80 100644
--- a/stack-ghc8.0.yaml
+++ b/stack-ghc8.0.yaml
@@ -11,5 +11,41 @@ packages:
 
 extra-deps:
 - easytest-0.2
+# Many newer versions to allow using the latest base-compat with all ghc versions.
+# This is just the first workable install plan I found.
+- aeson-1.3.1.1
+- aeson-compat-0.3.7.1
+- attoparsec-0.13.2.2
+- attoparsec-iso8601-1.0.0.0
+- base-compat-0.10.1
+- base-compat-batteries-0.10.1
+- bifunctors-5.5.2
+- criterion-1.4.1.0
+- generics-sop-0.3.2.0
+- hashable-1.2.7.0
+- http-media-0.7.1.2
+- http-types-0.12.1
+- insert-ordered-containers-0.2.1.0
+- lens-4.16.1
 - megaparsec-6.4.1
+- microstache-1.0.1.1
+- mmorph-1.1.2
+- network-2.6.3.5
 - parser-combinators-0.4.0
+- persistent-template-2.5.4
+- scientific-0.3.6.2
+- servant-0.13.0.1
+- servant-server-0.13.0.1
+- servant-swagger-1.1.5
+- singleton-bool-0.1.4
+- statistics-0.14.0.2
+- swagger2-2.2.2
+- text-1.2.3.0
+- unordered-containers-0.2.9.0
+# avoid no hashable instance for AccountName from doctests
+- hashtables-1.2.3.1
+# avoid hanging with windows symlinks https://github.com/simonmichael/hledger/issues/791
+- directory-1.3.2.2
+# hledger-ui
+# newer fsnotify has a different api and may be more robust
+- fsnotify-0.3.0.1
diff --git a/stack-ghc8.2.yaml b/stack-ghc8.2.yaml
index d6c8a597a..c82eeafe8 100644
--- a/stack-ghc8.2.yaml
+++ b/stack-ghc8.2.yaml
@@ -1,6 +1,6 @@
 # stack build plan using GHC 8.2.2
 
-resolver: lts-11.9
+resolver: lts-11.11
 
 packages:
 - hledger-lib
@@ -11,6 +11,19 @@ packages:
 
 extra-deps:
 - easytest-0.2
+# use the latest base-compat with all ghc versions
+- aeson-1.3.1.1
+- base-compat-0.10.1
+- base-compat-batteries-0.10.1
+- criterion-1.4.1.0
+- swagger2-2.2.2
+# avoid no hashable instance for AccountName from doctests
+- hashtables-1.2.3.1
+# avoid https://github.com/simonmichael/hledger/issues/791
+- directory-1.3.2.2
+# hledger-ui
+# newer fsnotify has a different api and may be more robust
+- fsnotify-0.3.0.1
 
 nix:
   pure: false
diff --git a/stack.yaml b/stack.yaml
index 1b790660d..d283b5193 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,6 +1,6 @@
 # stack build plan using GHC 8.4.2 and recent stackage nightly
 
-resolver: nightly-2018-04-25
+resolver: nightly-2018-06-02
 
 packages:
 - hledger-lib
@@ -13,16 +13,17 @@ extra-deps:
 # hledger-lib
 - easytest-0.1.1
 # hledger-ui
-- fsnotify-0.2.1.2
+# newer fsnotify has a different api and may be more robust
+- fsnotify-0.3.0.1
 # hledger-web
 - json-0.9.2
 - wai-handler-launch-3.0.2.4
 # hledger-api
-- servant-server-0.13
-- servant-swagger-1.1.5
-- swagger2-2.2.1
+# servant-server-0.13
+# servant-swagger-1.1.5
+# swagger2-2.2.1
 - http-media-0.7.1.2
-- servant-0.13
+# servant-0.13
 
 nix:
   pure: false