Added some more corrections