Updated a couple more files to include JavaDocs and made minor tweaks.