fix regex and stuff