and more, with first fixes
and more, with first fixes