Feature. Improving error messages, Feature. Removing unneeded log