Added frames per second display, commented old Map code