Fix Updates 6/21

With refactored code for Fix parsing.