Fixing even more bugs
Fixing bugs, updating the version