Bugfixing, minor changes.