First round of edits

Pretty awesome feature!