Formatting and functional fixes.