now use OC's mail, removed unused funct, fix some TODO add some others