Improvements + name change