Fixed
Merge branch 'master' into test
fixed loads of bugs finally + all code sorted fully