critical bugs fixed