added disco imformation, fixed some bugs in device