fixed critical bugs
updated