tweaked some details