Minor fixes, more data