some minor changes to device