Changed keyboard bool to an option local variable, etc stuff