general cleanup, including fixing figure labels