updated to have configs and general clean up