cleaning up code; fixing merge conflicts; updating images and minor style edits