Added TODO; Added more logging in act.wizard.c & cleanup