Adding comments and cleaning up the HapticPics