Code re-org/cleanup, and bug-fixes. The arduino end of things should be 100% now.