refactored, added some points
moved pyqtgraph to tree for easier checkout