Finale tweaks and testing. See: websharks/s2member#206