some new steps and some fixes