Added Clock metric and fixed user/system alerts

fixes #29