Added newly discovered option codes and other minor changes