Last corrections from stevesoltys