Add info() functions, more cleanup