fix return value - otherwise we get an error even when everything was alright
some code reordering - values are added in conf_check() now