Added the @include directive to include config files (recursively). Other less important fixes.
Small fixes.