Fixed And Trolled

Fixed it so there's no cm stuff to mix up with trollkat