small fixes / improvements