Please work! Some minor updates to fix crap that I didn't like from MJC's
version.