Filling in more options & docs