Improvements and fixes - r1.0.0