Some more clean up and debugging

Some more clean up and debugging