Finished basic progress reporting and cleaned up output a bit