Updating works better when you actually update

Some cleanup