add logers, do some todo's