Added a few more requirements and fixed errors in previous