general cleanup
Merge branch 'Development' of https://github.com/RyanRoberts/Basis into Development