Correct options check code. Effectively just a (Display -> display)
Make options automatic
Fix key logic (get name correctly)