typoes and cleanups