Fix some markup & other changes