Continued development

Minor changes to try and fix some bugs