Update readme
Update lots of Javadoc