Misc updates to areas and maps and bug fixes