Only smaller changes. But config error still present.
Signed-off-by: Stefano Leccese <stefano-leccese@visiongamestudios.de>