...followed by some minor bugfixing....