Final Commit2

Minor changes. Forgot a set method.