Typos/Consistency Fixes

Second editing pass