v0.7.1 several code improvements