Prepere for next release

Add prevent overrating function, fix some code etc.