v1.3 bug fixes!

Completely not worth having it all in a bunch however I was in a rush to
get this done so apologies for not separating the commits
79 files changed