Some changes + docs