small fixes for proof of concept parsing and pivoting