several fixes and additions (pro related)