- fixed some minor bugs

 - changed the device template