Kota's requests / then some other minor edits