Yes Zarin Bukhari has covered all well. But I suggest that you must go through Shehrbano's book as well for both papers. She would be paper setter according to my sources.