Minor adjustments

Final Submission