adjusted defaults and remove console logs