typos and cleanups

- FIX: typos
- CHG: cleanups