Fixed bugs in voltage chain
Hard and scenario 2 now working
Merge branch 'tools'