More work on graphs
Fixed more time zone issues and 'to do' items