Use Options in the right place

Also get record_mode working