Changed various things
Finished tut 2