Fixed a few updating bugs, improved feedback.