added placeholders and many small changes