Revert several changes in v0.0.12 and imporve router and config handling