Fixed some output formatting. Removed some debug-prints.