fixed timer; added more todos