WIP bold italic and small changes