ION changes, etc.

ION changes: Thanks to @icepeda
Other changes, thanks to Omap / Google