all fixed except int bug