Adds requirements, minor fixes

Change-Id: I38cf242b2314f6f30ea0c4bec659aff1ace703b3
+ minor fixes

Change-Id: I88ad2294a71078215e630b6da17fa3a226079f94