Added os info and fixes

Added os version and architecture.
Merged fixes from other repos.