config + bug fixing