improve comments, remove dead code, fix bug in func.im_self testing