cleaned up config & base