Sundry edits

Post edit and image edit