improvements
misc fixes / improvements