code clean-up and new lib versions