some fixes in instruction