bufix: MasterState right-click without map crashed, also typos