small changes and tweaks to ICP