updated config and renamed somethings to clarity
updated config and renamed somethings to clarity