Data change and little fixes
few changes