some fixes + weight change