add stuff that came out during the CTG conference
fix naming