unexpose some types, plus some formatting