Added obj:needs_update and some cleanup.