Add final frame and other small tweaks