See last commit message - accidentally commited the maps directory only. Whoops. This commit actually implements the bug fixes found in the last commit message.