Fixed more stuff. Still some weird routing issues.