Miscellaneous changes

Graphics to come