Retool scripts for yitzi's patch and minor fixes