couple bugfixes should run now