renamed some pages, changed some stuff with sam