if directory fix
todo's