General updates

including using local font