Various updates, and add VERSION = 1