Finished bug fixes for Cinema