Refactors and fixes

This release is mainly tidying up of some internal code as well as adding minor fixes, so no major new features here.