File from Greg, finer time distribution
Minor cleanup