several fixes
fixes