A few more strings and minor adjustments