add cat & solve some bugs