- some fixes on latest commit