Some small bug fixes; doc update; a few graph modifications following meeting with WJ