Minor Changes

Very much a half way update between features