tiny fixes everywhere