Bug fixes, cleanups, and still working on connecting skills at start.