changed config, completed variables, added mapping