Fix more stuff
Map support fully working. Fix /maps