make variable naming uniform
Merge branch 'master' into varnames
add time-saving tricks to basic building blocks