sure. just fixed those and squashed additional commits