-minor bug fixes