little refinements and ideas