Reindent packages to install
Another set of various changes