Several tweaks, bug fixes, improvements in the house overall