massive refactor and adjusting multipliers