Misssed some stuff in last hurried commit. Must stop doing these stupidly fast commits