fixes
lots of fixes