more changes
Bug fixes and more