add placeholders + small fixes