Added some weigth methods, redid some hardcoded numbers.
Merge origin/master