minor weighting fixes
minor cleanup and sanity weighting check
Merging features/gaia into release.
Merging release into master.