Minor changes to maker; Speed up analyzer.