fixed references
fixed timer