Lots of placeholders and small bugfixes.