new stuff and bugfixes
new stuff yay