some fixes working on