epoptes: some fixes