fixed not being on a page
changed typografy
merged