Cacat review added, some other changes