finish up map panel and lots of other tweaks