Fix mode2 output whitespace, add stats reporting, re-arrange some sub locations for code readability, replace some returns with if-blocks.