Typography and few comments added