Work in progress: Stopmotion feature - Fixing several issues