Update code and JavaDocs

Update Sprint4
Update Sprint5
JavaDocs