Added Player selection, JavaDoc, some more cleanup