Cleanup and added video.