a few changes requested by @problem