some changes, no speedup
fixed timeDelta bug, changed size
Merge branch 'master' into working-clean