Fix a few weird javadoc omissions
Fill in more javadocs, and a little bit of planning for Economy