Improvements, todo for tommorow