Commented errors around, some fixed