the other fixes by decasm++