Final optimization. Now 50*50 finished :)
Warnings fixed
Merge branch 'victor'

ups, there is some extra changes in EP1