added basics for cat and cleaned up remaining Map instances