Improvements and adding getCurrentRoute to router