fixes in cat and mouse