Guide fixes

+ Fixed typos
+ Cleanup code
+ Minor fixes