Easier edit and better error messages.