fixes & refactor [2.0.9.1]