cleanup (minor changes), see #167
tests update, see #165