Add Watchify. Fix a few bugs.