Minor QSTools update and cleanup