iron router upgrade, comments and general cleanup for peer review