Added u.mcf.li support and other stuff