iron out some small problems