fixed some regex stuff