fixed critical bugs
#
updated
final