Lots of changes and fixes to homes system