not finished yet
minor changes in plotting and printing