fixed some bugs on the wearable side