Fixing some problems with the Home object.

Some problems where introduced with the Home class, this fix them.