Some changes and a bit of documentation