Output cleanup, grammar fixes, some bugfixes