Minor comment tweak
Layout fix for FF
Minor performance fix
Minor performance fix
Minor performance fix