did some stuff
Merge branch 'master' into john
fixing conflicts