CBL iOS: incorporating review comments + misc updates