refactor
minor renames, initial page spec
add specs, refactors