minor clean-up, bug-fix in ichip