Added comments, changed some outputs