a few more fixed after runnign in Firefox