minor fixes, safari bug fix
merge...