Did some corrections