misc changes
merged conflicts
small changes with new graphs
merged'