Some changes, cleanup and update