building with new ion changes, bug fixes