incorporate various feedback from @fschulze