testing some new fixes v0.5 2019