added remove to maps and some bugs