new home / fix some bugs