Added helpers to generate geometry, fixed the normalized current time
merge