Added extra regexes and other general fixes

Pull request yay