Various updates, see readme.