Typos
Clearer rosnode gen
Merge remote-tracking branch 'upstream/master'