Added requirements, bugfixing