Fixed map drag, and some other additions