Merge pull request #113 from thefinestsieve/beta

Various map change related fixes
Got rid of unused flags