Some cleanup + made up movies, partially login