Clean and Minor Update

This is just a cleanup to the code itself. This also is a minor update to a few files to correct minor mistakes.