Corrections and adding correct packages