fixed todo's