lots o' fixes
lots o' fixes