Improvements improvements Everywhere