Update comments
Fix some Firefox compatibility issues