Fixed the figure layout and numbering. Also a couple other tiny fixes.