remove home dir
incorporate Nicko's fixes from #12