tons of fixes, unlimited 1d parsing