removed manual trailing slash and echos