Add comments and fix placeholder names