Small changes, more debugging.