fixed a couple bugs, added maprestart