Commit No.6 Author querying changes and simple tweaks