fixed parse errors
merged?