A little more done on plotting, checkin to test on linux