Minor changes
testing
testing...
testing...
testing...
Various small changes + adding config-file