cleanup for release
fixed timestamp calculations