Fixes from Juan
Comment cleanup
Fix after Juan