Improvements and adjustments (Ver. 1.0.2)