Minor updates, added more comments