Added set, fixed get