JS/class tweaks.