Updated parser and fixed bubble removal