Merge pull request #412 from dorkster/bugfixes

Use frames for power cooldowns