More debugging
Verify the state, too
Fix link / cleanup code
Glue state into more places