Changes made by mshipway

These were updates to the code made by mshipway that needed to be put in
GitHub