Lots of tweaks; last update to pacman for now