Various improvements (v2.1)