many tiny fixes