last commit, some fixes