updates some stuff for conference 2013