more fixes & features