some fixes in order