Details
Several small changes