Gist: Lots of tweaks, including Ace. Fix #160