fixing critical issues