More parsing fun.
Small changes