fixed more self stuff