removed some bugs in cmhome