fixed todo's for self