Minor Optimizations & Typos

Just a few typos