Improves option handling, wip mixing nil options with set options