tweaking some details