Fix output logging and add different runType's