fix and improves to parse and routes