various fixes
hacking