minor bug fixes, added file routing
missed files in last commit