fix: several modification