Fixes and Improvements and Adding some features .... maybe