speed improvements
some speed improvements
add set timing