Implemented improvements and bug fixes