Addressed tons of issues which came up during code-review of catkinization.