major bufixes & improvements
Merge branch 'marius'