changed to feature, fixed some config issues