fix flash
fix fixtures
Refactor time management