v.2.1.6 - Bugfixes & minor improvements