fixed major route bugs