updated, still needs config mods