More tweaks.
Fix stupid JS bug.
Minor tweaks.