Configuration is about done, one bug remains.

Signed-off-by: Michael Fabian Dirks <hellbirdxjun@gmail.com>