minor bug fixes (guess who I am)