Numerous bug fixes
Comments for improvements to be made
Merge branch 'development' of clark.pmaclabs.com:tools/PEBIL into development