More bugfixing
Merge pull request #44 from the12chairs/last_steps

More bugfixing