minor changes to cat and mouse