minor fixes / improvements