some fixes made