better langguage and some correction on package name