small fix & todo