improvements to the overlay and ebuild -- these need testing.