again, more improvements