Requirement cleanup and bugfixing