Did some cleanup and commenting on weight calculations
Merge branch 'master' of github.com:zyzzyplyx/GREAT