Fixed routing issue and minor bugs.