Commiting latest changes and bug fixes