lots of fixes
meh
lots of fixes