fixed a bit made some placeholders