Done, also improved the parse algorithm.