plot updates and bug fixes