misc fixes

will this project ever end...