merged all branches because it had turned into rather a mess of me not knowing what I was doing
fixed a couple of things I messed up in the merge