Patch 1.0.2 - More Fixes and Improvements