small fixes & tested parser