More Misc. Edits