Added seperate Time for Comcheck at norrokie

also some cleanup