Some changes, more comments