activity clock and minor fixes