Added some more stuff, corrections