various fixes

title