Update features and simplify route a bit.