Pull improvments from main