Some tweaks to the UI, nicer Update code etc.