Final Commit

This is the final commit. Some minor aesthetics changes.