Minor bugfixes and more modifications on printed output.
Merge candidate 1 -- reset atoms.py to it's non-testing state.