added config + improved stuff