-Fixed warning filtering bug
-Updating to reflect changes in :house