Removed some code, refined more messages, things like that.