More tweaks and placeholders.