small fixes & additions