General bugfixes

Bugfixes/improvements are in commit messages.
Don't hardcode numbers unless you absolutely have to. This should be `initial number of lives - 1`.