More tweaks to cat.dart