few cypher tweaks