cleanup, moving more to prototype, min/max & units working