Many small tweaks; updated dependancy on hppy