Whole lotta parsing fixes