fixed maps stuff, added some new features