More updates. Debug code still in.