charles edits + fixed some figure positions again