Made plotting much better and changed names around