Added some missing comments. Minor fixes. Pretty much done