small fixes and placeholders