MicroRouter added, some bug fixes and refactoring