bunch of misc fixes
done