a few small misc things and fixes