Huge update, confighandler is broken