Fixes and Typos