minor fixes, comments and placeholders