Small Bug Fix + Getting Ready For Movie Sorting