Placeholders and minor fixes