some optimizations and improvement#2

Nukoooo merged 2 commits into

masterSource2Surf/Timer:masterfrom

testSource2Surf/Timer:testCopy head branch name to clipboard