Knowledge requirements and a few bug fixes