various fixes; abi module work-in-progress