Bug fixes, address codenarc items