Improvements to all functionaility