Removed debugging.
Minor cleanups.
Minor cleanups and comment removal.
Fixing charts.

Still very buggy.