various plotting updates and rearranging for Odyssey run