various fixes
test