cleans up config, fixes helper