buncha tiny fixes