bug fixes and requirements update