first working go at host and target builds
removed some lingering oddments