bugfixes and simplification
1.7.3