cleaned up router, removed history from router, consistent routing triggers