general cleanup (spacing and 80 columns)
added packages to keep pace with upstream