Tidy ups, more comments