fixed names of some of the new decorated methods
chnaged retry decorator to not look up or rely on the presence of "self"