added clock. WIP
correct units in docs
merge
style fix for merge
merge
style fix