Added set and other minor changs