Added thingies to make code readable
Merge branch 'final' into final_tom
made things pretty
merge conflict fix