some fixes. still some serious bugs in 4store data