Various improvements based on review feedback