various fixes
trying to merge