fixes & additions