fixing up various things