amend several errors
amend routing