various fixes

some fixes! :)