etc: some updates