Added PSO to Gibbs, and updated some plotting