Fixed some bugs.

Still have some bugs that have to do with where the update field is enabled/disabled