Changes and Improvements to prepare to jump to 0.3