changes and bug fixes in design