Made some changes and bug fixes