Little changes
Merge branch 'misc' into pages