Various changes... Mostly worked on the return value EH code.