bug fixes, + keyframes and truncate