Upped deployment, tweaked delegate call, cleaned up some ivars