modified generate-cypher command + fix cs