added movie names and neatened up defaults