buffing out a few prototype things