added comments and oray feature todo