registration fix and home cleanup