Fixed some bugs and added some initial split code.
Minor tweak to the walkthrogh.