fixes and refactorisations