Whole package of changes

Take that you bloody reviewer!