Map Bugfixes, some past due Ninja changes