routes changed, minor bug fixes