Few changes and bug fixes