clean up + tiny fixes