Trying to straightify setup.
Improvements.