several code improvements and v 0.7.2