More try-finally use
Small fix and large comment on QS instance