add NamedStmt support, lots more testing around it...  still no Map support