Some cleanup and notes, changed vibration values