Small core changes
Merge branch 'dev' of https://github.com/Liamraystanley/Code into dev