fixing setup and packages