Resolve problems discovered from initial prototype build. This will be the first version that is recommended for others to build, without needing any hacks/bodges.