removed commented out code, fixed a set function not returning this pointer