Bug fixes and 3 in 1 plots