Small bugfixes done.