Update master to small & add diagnostic table
Several bugs fix