major plotting updates