Arcology management fixes and cleanup

Fixes some comments being output and a few other stray conversion issues (spaces, etc). Reduces scope or eliminates a bunch of variables.

merged

mentioned in commit 187c832b