saferizing some more regex's, and cleaning some stuff up