change type of `execute`, fix `q`