Misc. Edits / Fixes