various updates based on Pastor David feedback