First commit with some corrections