varioush minor fixes