various fixes
jeje