bug fixes, added route