Version 2.5 update

Added iPad support and squashed a bunch of bugs. Hooray