3.2.1710.164 changes

A little bit of fixes and balancing