Merge pull request #306 from Jedwondle/master

Fixed a typo.
fix for javadocs
Merge pull request #307 from dshurt/master

fix for javadocs
Fixed a few bugs

Still have to figure out why multiple pros/cons sometimes doesn't work. and what to do about Q&A