Improvements and bugs resolved