Fixed several critical bugs