Performance improvements, fix key binds
Performance improvements, fix key binds