Some basic Improvements