Some edits for less derp