fixed some syntax; removed routing stuff for now.