better console output
+arrangement changes
+bug fixes