Removed a couple of sources of potential crashes
Added code to prepare for IB preview