make adjustments suggested by @ax3l