Fixes, separating page, prep for improvmnts