Several small alterations