I Come In Peace: Small Update

Bug fix & Performance improvement