Some fixes and plot size changes.