Device improvements