minor changes in catwm.c