Finish typography and few changes