Update to populate discover and fix a few bugs with home.