update
updated some bugs, added routing