Some more Improvements