fixes
major bug fix + optimization
fix
Merge branch 'lennart'