Moved trivial from net to store.
Fixed some javadocs.
29 files changed