little updates from @mrcdk