Minor fixes and data addition