fixing pacakge order and missing comma