new stuff

some more fixes/errors