fixes & debugging