various minor functionality