more Cleanup and start of serial read intergration

[JamesCordell]

Should I rebase or add a commit to correct these changes?

[mikeller]

Considering it's a lot of changes already a rebase / squash is probably best.