XMas checkin, new workflow and some bug fixing.