most fixes applied