Corrections & tweak refactor