fixed comments, added missing lineparser, removed manual routing