tuned up weight parsing script and added weights to more places