Fixed some variable scaling issues, needs further attention
Fixed scaling issues