Maintenance

The majority of the changes have been completed, we are working through a few small issues that have cropped up as a result, but in general things should be working