Big clean up and fix image refs
Publish