Improved code layout and progress outputs
Updated to V4.0.1