some fixes in my part