Big parsing fixes / improvements