More placeholders and other minor changes