fixed lang issue and packaging