MapEdit Work

-various fixes