cleanup
better faux values