Splitted a bit and wrote some parsing code.
Some more fixes.