Better debugging for editing
Update BUGS