Various edits and cleanup