Unlimited steps

Bugfixes