Comment changes + andymark conversion activation