Added/updated comments and TODOs/ideas and extracted timer creation.