Layout modifications.
Finished Javadocs.