added routing
modified some stuff