added comments
removed extra files from test data
minor code changes, more comments
merged legend commits and jwo commits