Fix with suggestions.

Second pass fixes using parkr suggestions. this commit fixes #26 and fixes #58 issues.