more fixes for data parsing