Updated more placeholders and fixed some spacing issues.