Minor improvements, added Vibration