Minor change
Added a lot of config
Many changes