a bunch of updates from FSP Maps Development