fixed some important aspects, added a different plotting mechanism