comments
add specs
updated routes
fix merge conflict