recommit some fixes