Miscellanious edits.