more bugfixes and fixing what i broke after using maps..