Added more data, minor clean up anfd fixes