Improvements + corrections