routes + bug fix