first goes at testing
big and little bug fixes.  see spark 7/7