Some smaller changes...

...but no working site config yet :(