Made several Improvements