Map categories update

Added more categories
Made so that last loaded map saves
More strict category checking