bunch of fixes and more