some details tweaked