corrections here and there...