Many improvememts