Fix markup through various covert means
Update to 1.2.1