fix: several changes