watson 0.1

Minor improvements and fixes