options class, some fixes