Adding more fixes, and adding ION build