fixes and more