Fixed timer.
Expanded container functionality.