- several fixes