Further improvements to capifony