made routes friendly
merged changes