added and improved plotting features