Tenth Commit

Starting error fixes after peer feedback