Lodging section, registry, and some other tweaks