More cpyn updates