more fixes & additions