Cleaning up a bunch, making instance viewing the default instead of pattern viewing