Fixed Map render error which caused it to drop the fps. also a few other
misc bug fixes