updated routes, fixed form