several fixes and new dependencies