Making some updates to the typography and fixing bugs