Some minor bugs fixed following meeting with Yan today, Will continue.