Debug changes now working, commited to svn repo