small fixes & clean up