improved some parts in Tools.Parser
moved Ole to Language