removed cat, fixed some bugs