Various bugfixes
Incremented version