Some changes, start work on 'plot'.