Small bugfixes, updated dancer