added graphs
fixes+testing
merged from remote