Merging Development

A few IPO changes and tweaked interface.