changes and bug fixes