Small wording updates, added Database shapes handling.