made some fixes with Ben