Small adjustments and missing string