Updated options & cleanup