lib files updates (some cleanup)