misc
misc
lots of fixes