More updates to Options, done on phone XD