fixed todo's in code