Substrate-substrate interaction, bug fixes.