check was faulty
fix timestamps
minor clean ups
merge