Minor stuffs fixed!~