neater code and some stuff with arrays
Merge branch 'Jack_Tutorial_Branch'