Another test & some minor reorganization.
Fixed an issue with linking, minor cleanup.
Fixed spaces.